Fix statement vs expr #62

jakzale · 2020-04-03T14:52:45Z

Fixes #51, #54

Essentially we make [Statement f] as our program and the main parsing rule.

Fix Sign vs Sig naming issue,
add Statements f newtype for [Statement f]
add Program f newtype of Statements f as top-level node of AST.
duplicate necessary functions with
- stmt prefix for statements, and
- expr prefix for expressions.
update and clean up all the test cases.
add stack bench for testing the generators.

In addition we add the benchmark of quickcheck generators

test/Field/golden/forLoops.golden

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Raw/Core.hs

field/TinyLang/Field/Rename.hs

field/TinyLang/Field/Typed/Core.hs

field/TinyLang/Field/Typed/Parser.hs

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Rename.hs

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Typed/TypeChecker.hs

jakzale · 2020-04-15T19:01:36Z

@effectfully, I added a benchmark (stack bench) for testing the generators.

Does the following output looks good to you?

Requested runs:  1000
Requested size:  1000

Minimum depth = 0
Maximum depth = 15
Mean depth    = 3.168

Minimum number of nodes = 0
Maximum number of nodes = 1890
Mean number of nodes    = 565.964

effectfully · 2020-04-16T11:32:47Z

Does the following output looks good to you?

Yes. We'll need some more refined tool to output other interesting stats (how many adds, muls etc there are, how many variables the program has, how many of them are mentioned at least twice, how many comparisons are done on "negative integers", etc).

We'll also need to see if it makes the compiler tests slower, 'cause they are already quite slow.

But for now looks good.

effectfully

I'll review the generators stuff a bit later.

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Raw/Core.hs

field/TinyLang/Field/Rename.hs

field/TinyLang/Field/Typed/Core.hs

field/TinyLang/Field/Typed/Parser.hs

field/TinyLang/Field/Typed/TypeChecker.hs

test/Field/Textual.hs

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Generator.hs

jakzale · 2020-04-24T20:21:15Z

There are some issues with ProgramWithEnv arbitrary instances:

        *** Failed! (after 4 tests and 1 shrink):
        evaluation of renamed program
        [Some 16,Some (UniConst Bool False),Some 1]
        differs from evaluation of original program
        [Some (UniConst Bool False),Some 16]
        for final state of renamed program
        Right (Env {unEnv = fromList [(0,Some 16),(9,Some (UniConst Bool False)),(23,Some 1)]})
        for final state of evaluated program
        Right (Env {unEnv = fromList [(9,Some (UniConst Bool False)),(23,Some 16)]})
        for renamed program
        let u_0 = 16;
        
        for original program
        let u_23 = 16;
        
        ProgramWithEnv (Program (Statements [ELet (UniVar {_uniVarUni = Field, _uniVarVar = u_23}) (EConst 16)])) (Env {unEnv = fromList [(9,Some (UniConst Bool False)),(23,Some 1)]})

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Typed/Core.hs

field/TinyLang/Field/Generator.hs

field/TinyLang/Field/Typed/Core.hs

field/TinyLang/Field/Evaluator.hs

field/TinyLang/Field/Generator.hs

field/TinyLang/Field/Raw/Core.hs

field/TinyLang/Field/Generator.hs

test/Field/Textual.hs

field/TinyLang/Field/Evaluator.hs

Fixes effectfully#51, effectfully#52 We make the following changes to the AST by adding - a newly introduced a top-level `Program` node, which is parent to - a newly introduced `Statements` node, which is parent to - a `Statement` node, which is chaned to be a parent of - an `Expr` node. We make the following changes to Statement by - introduce a `EFor` node to the typed AST. We update update the evaluator by - providing an explicit transformer stack (`EvalT`), - fixing the semantics for for loops, and - switching to CPS both in evaluator and normaliser. We also add minor improvements to the codebase by - fixing `Sign` vs `Sig` naming issue, - cleaning up some naming conventions, and - providing `stack bench` benchmark for testing generators for the new AST.

field/TinyLang/Field/Evaluator.hs

jakzale · 2020-05-18T15:59:31Z

I suspect there will be a test error, but it will be tied to #76 due to lack of assignments and proper typing environments.

effectfully

Ok, let's get this in!

effectfully · 2020-05-18T16:29:40Z

field/TinyLang/Field/Evaluator.hs

+        where
+            go i fkont = withVar var (Some $ fromIntegral i) $
+                            evalStatements body fkont
+            actualEnd = Some $ fromIntegral $ max start end


As per previous discussion we already know in the otherwise clause that start > end and hence can do withVar var start kont there instead, but not a big deal.

jakzale requested a review from effectfully April 3, 2020 14:52

effectfully reviewed Apr 3, 2020

View reviewed changes

jakzale force-pushed the fix-statement-vs-expr branch 2 times, most recently from 1563033 to 286f878 Compare April 9, 2020 20:52

effectfully reviewed Apr 11, 2020

View reviewed changes

effectfully reviewed Apr 13, 2020

View reviewed changes

field/TinyLang/Field/Evaluator.hs Outdated Show resolved Hide resolved

effectfully reviewed Apr 13, 2020

View reviewed changes

field/TinyLang/Field/Typed/TypeChecker.hs Outdated Show resolved Hide resolved

jakzale force-pushed the fix-statement-vs-expr branch from 631ab6a to 362dd1a Compare April 14, 2020 16:24

jakzale force-pushed the fix-statement-vs-expr branch from 0d04fa9 to e379866 Compare April 16, 2020 13:01

jakzale marked this pull request as ready for review April 21, 2020 21:04

jakzale linked an issue Apr 21, 2020 that may be closed by this pull request

Loops #54

Open

effectfully reviewed Apr 22, 2020

View reviewed changes

jakzale force-pushed the fix-statement-vs-expr branch from ea1414d to 884b3ca Compare April 27, 2020 11:53

effectfully reviewed Apr 28, 2020

View reviewed changes

field/TinyLang/Field/Evaluator.hs Outdated Show resolved Hide resolved

effectfully reviewed Apr 28, 2020

View reviewed changes

field/TinyLang/Field/Evaluator.hs Outdated Show resolved Hide resolved

effectfully reviewed Apr 28, 2020

View reviewed changes

field/TinyLang/Field/Typed/Core.hs Outdated Show resolved Hide resolved

effectfully reviewed Apr 29, 2020

View reviewed changes

field/TinyLang/Field/Generator.hs Outdated Show resolved Hide resolved

jakzale commented May 5, 2020

View reviewed changes

field/TinyLang/Field/Typed/Core.hs Outdated Show resolved Hide resolved

effectfully reviewed May 5, 2020

View reviewed changes

field/TinyLang/Field/Typed/Core.hs Outdated Show resolved Hide resolved

jakzale commented May 13, 2020

View reviewed changes

field/TinyLang/Field/Evaluator.hs Outdated Show resolved Hide resolved

effectfully reviewed May 13, 2020

View reviewed changes

jakzale force-pushed the fix-statement-vs-expr branch 2 times, most recently from 1895d10 to 8a10069 Compare May 14, 2020 12:02

jakzale force-pushed the fix-statement-vs-expr branch from 5bd322e to 7685541 Compare May 15, 2020 19:42

jakzale requested a review from effectfully May 15, 2020 19:45

jakzale requested a review from kwxm May 15, 2020 19:47

effectfully reviewed May 18, 2020

View reviewed changes

field/TinyLang/Field/Evaluator.hs Outdated Show resolved Hide resolved

field/TinyLang/Field/Evaluator.hs Outdated Show resolved Hide resolved

field/TinyLang/Field/Evaluator.hs Show resolved Hide resolved

Jakub Zalewski added 4 commits May 18, 2020 17:17

Refactor code to remove wrapping

2133925

(WIP) Fix the semanics for for loop

ae10309

Fix indentation

5ced30d

Fix whitespace

551078a

effectfully approved these changes May 18, 2020

View reviewed changes

effectfully merged commit 7ade59b into effectfully:master May 18, 2020

jakzale deleted the fix-statement-vs-expr branch May 19, 2020 09:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix statement vs expr #62

Fix statement vs expr #62

jakzale commented Apr 3, 2020 •

edited

Loading

jakzale commented Apr 15, 2020

effectfully commented Apr 16, 2020

effectfully left a comment

jakzale commented Apr 24, 2020

jakzale commented May 18, 2020 •

edited

Loading

effectfully left a comment

effectfully May 18, 2020

Fix statement vs expr #62

Fix statement vs expr #62

Conversation

jakzale commented Apr 3, 2020 • edited Loading

jakzale commented Apr 15, 2020

effectfully commented Apr 16, 2020

effectfully left a comment

Choose a reason for hiding this comment

jakzale commented Apr 24, 2020

jakzale commented May 18, 2020 • edited Loading

effectfully left a comment

Choose a reason for hiding this comment

effectfully May 18, 2020

Choose a reason for hiding this comment

jakzale commented Apr 3, 2020 •

edited

Loading

jakzale commented May 18, 2020 •

edited

Loading